🌎 rns.kin.earth git 🌍

Node / dev / reticulum / commits / 8c506b0

󰉖 Browse tree at this commit

Parents : 67fc768

Author : Mark Qvist <mark@adepta.io>

Date : 2020-05-06T14:34:19+02:00

Cleanup in interfaces

3 files changed, 8 insertions(+), 13 deletions(-)

M RNS/Interfaces/AX25KISSInterface.py +2 -2

M RNS/Interfaces/KISSInterface.py +4 -5

M RNS/Interfaces/RNodeInterface.py +2 -6

diff --git a/RNS/Interfaces/AX25KISSInterface.py b/RNS/Interfaces/AX25KISSInterface.py

index 916f7985..d699549d 100644

--- a/RNS/Interfaces/AX25KISSInterface.py

+++ b/RNS/Interfaces/AX25KISSInterface.py

@@ -25,8 +25,8 @@ class KISS():

@staticmethod

def escape(data):

- data = data.replace(bytes([0xdb]), bytes([0xdb])+bytes([0xdd]))

- data = data.replace(bytes([0xc0]), bytes([0xdb])+bytes([0xdc]))

+ data = data.replace(bytes([0xdb]), bytes([0xdb, 0xdd]))

+ data = data.replace(bytes([0xc0]), bytes([0xdb, 0xdc]))

return data

class AX25():

diff --git a/RNS/Interfaces/KISSInterface.py b/RNS/Interfaces/KISSInterface.py

index d80cb1b0..e6b96093 100644

--- a/RNS/Interfaces/KISSInterface.py

+++ b/RNS/Interfaces/KISSInterface.py

@@ -1,4 +1,3 @@

-

from .Interface import Interface

from time import sleep

import sys

@@ -25,8 +24,8 @@ class KISS():

@staticmethod

def escape(data):

- data = data.replace(bytes([0xdb]), bytes([0xdb])+bytes([0xdd]))

- data = data.replace(bytes([0xc0]), bytes([0xdb])+bytes([0xdc]))

+ data = data.replace(bytes([0xdb]), bytes([0xdb, 0xdd]))

+ data = data.replace(bytes([0xc0]), bytes([0xdb, 0xdc]))

return data

class KISSInterface(Interface):

@@ -53,7 +52,7 @@ class KISSInterface(Interface):

self.online = False

self.packet_queue = []

- self.flow_control = flow_control

+ self.flow_control = flow_control

self.interface_ready = False

self.preamble = preamble if preamble != None else 350;

@@ -203,7 +202,7 @@ class KISSInterface(Interface):

in_frame = False

escape = False

command = KISS.CMD_UNKNOWN

- data_buffer = ""

+ data_buffer = b""

last_read_ms = int(time.time()*1000)

while self.serial.is_open:

diff --git a/RNS/Interfaces/RNodeInterface.py b/RNS/Interfaces/RNodeInterface.py

index 7a680560..14d3cf7b 100644

--- a/RNS/Interfaces/RNodeInterface.py

+++ b/RNS/Interfaces/RNodeInterface.py

@@ -48,8 +48,8 @@ class KISS():

@staticmethod

def escape(data):

- data = data.replace(bytes([0xdb]), bytes([0xdb])+bytes([0xdd]))

- data = data.replace(bytes([0xc0]), bytes([0xdb])+bytes([0xdc]))

+ data = data.replace(bytes([0xdb]), bytes([0xdb, 0xdd]))

+ data = data.replace(bytes([0xc0]), bytes([0xdb, 0xdc]))

return data

@@ -419,10 +419,6 @@ class RNodeInterface(Interface):

else:

RNS.log(str(self)+" hardware error (code "+RNS.hexrep(byte)+")", RNS.LOG_ERROR)

elif (command == KISS.CMD_READY):

- # TODO: Flow control is disabled by default now.

- # Add timed flow control ready-inidication to the

- # RNode firmware to make sure flow control doesn't

- # hang if it is enabled

self.process_queue()

else: